Fix build with ghc 9.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index aa63a40a0e06f72f5172344e83ca608f43da7be2..a220b171d2662a7f467276e73e3e4d5e3a63ced3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ git-annex (10.20250926) UNRELEASED; urgency=medium
   * enableremote: Allow type= to be provided when it does not change the
     type of the special remote.
   * importfeed: Fix encoding issues parsing feeds when built with OsPath.
+  * Fix build with ghc 9.0.2.
 
  -- Joey Hess <id@joeyh.name>  Thu, 25 Sep 2025 13:36:21 -0400
 

diff --git a/Utility/OpenFd.hs b/Utility/OpenFd.hs
index 95f18085a655baba8ad298c7bc7e6ed92a62dc42..62ce4ace91734b8641352275efb990e252952fb3 100644 (file)
--- a/Utility/OpenFd.hs
+++ b/Utility/OpenFd.hs
@@ -14,6 +14,9 @@ module Utility.OpenFd where
 
 import System.Posix.IO.ByteString
 import System.Posix.Types
+#if ! MIN_VERSION_unix(2,8,0)
+import Control.Monad
+#endif
 
 import Utility.RawFilePath
 

diff --git a/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error.mdwn b/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error.mdwn
index 5ae44072f5bd4a39533bb037a1f1e25770170b03..a0a7a2882cd4e97767c67ed411e9b21d66acc272 100644 (file)
--- a/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error.mdwn
+++ b/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error.mdwn
@@ -11,3 +11,5 @@ Utility/OpenFd.hs:28:9: error:
 ```
 
 I'm not sure this error is directly caused by the antiquated compiler, but also not sure how to debug this further or work around it either.
+
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error/comment_1_b8ace7d676bdecfd0e3bb47331e48a13._comment b/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error/comment_1_b8ace7d676bdecfd0e3bb47331e48a13._comment
new file mode 100644 (file)
index 0000000..1c923b2
--- /dev/null
+++ b/doc/bugs/Compiling_20250925__44___variable_not_in_scope_error/comment_1_b8ace7d676bdecfd0e3bb47331e48a13._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2025-09-29T15:19:41Z"
+ content="""
+git-annex is still targeting supporting ghc back to 9.0.2, so your old
+ghc should not yet be a problem. However, I don't have any CI left that
+uses such old versions of ghc, so it might break from time to time.
+
+I've fixed this one, which was a missing `import Control.Monad`. Please
+report if you find other build failures.
+"""]]